From: Kenichi Handa <handa@etlken>
Date: Mon, 9 Aug 2010 01:51:16 +0000 (+0900)
Subject: merge trunk
X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1~1^2~324^2~7006^2~5
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=f9c5b9611be187e22c3283418ebd9fd4bc5b61d3;p=emacs.git

merge trunk
---

f9c5b9611be187e22c3283418ebd9fd4bc5b61d3